Merge branch 'master' of https://github.com/gpsbabel/gpsbabel
authorRobert Lipe <robertlipe@gpsbabel.org>
Tue, 23 Feb 2016 19:19:25 +0000 (13:19 -0600)
committerRobert Lipe <robertlipe@gpsbabel.org>
Tue, 23 Feb 2016 19:19:25 +0000 (13:19 -0600)

Trivial merge